Fix bnd-maven-plugin configuration merging #3490
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@cziegeler Can you have a look as well? Actually it doesn't seem to be a bug in bnd-maven-plugin but just a misunderstanding how the effective plugin configuration is calculated: https://issues.apache.org/jira/browse/MNGSITE-544 |
davidjgonzalez
approved these changes
Dec 5, 2024
davidjgonzalez
added
the
Skip-Changelog
|
@kwin does this address the missing onprem bundle from the all.zip as well? IIRC from last night it wasnt being added as a dep to the all's non-cloud profile. |
|
@davidjgonzalez I just added the missing dependency in 52a5bee |
|
It looks like the build is failing due to the onprem bundle failing aemanalyser checks: I ran into the same when I was trying to fix this in the other PR. Do we just skip running the analyzer for the non-cloud, and let the cloud build fail on any errors in the shared bundles? Im not seeing any way tell it to not analyze a specific artifact..? |
kwin
force-pushed
the
bugfix/fix-bnd-config-merging
branch
2 times, most recently
from
b1e5fd2 to
02ce4da
Compare
|
@davidjgonzalez I now excluded running the aemanalyser on the classic/onprem package in 02ce4da. It only evaluates the one with |
|
@kwin - This is still failing, but now it thinks jacoco is being added to the bundle, tho from what i can see that's only included w/ the test scope. |
|
The relevant error is Not sure how the Jacoco agent may affect the Manifest generation and why that error was not emitted before... |
|
Turns out the reason is offline instrumentation for jacoco (compare with https://www.eclemma.org/jacoco/trunk/doc/offline.html and https://www.eclemma.org/jacoco/trunk/doc/faq.html). It is unclear to me why Jacoco Offline instrumentation is used at all (introduced with 7cb5929, due to #1321). As powermock is no longer used, we should completely get rid of it. Jacoco seems to be leveraged for CodeCov (https://github.com/codecov/example-java) as well. |
Previously the configuration from the parent (per execution id) was overriding the local config (per plugin). Now the parent configuration is no longer per execution id, i.e. both local plugin configurations (i.e. on plugin level and on execution id level) take precedence. This closes #3471
Simplify embedding Only run aemanalyser on package with classifier "cloud"
kwin
force-pushed
the
bugfix/fix-bnd-config-merging
branch
from
c791475 to
e37eea7
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #3490 +/- ##
============================================
+ Coverage 55.54% 55.80% +0.25%
- Complexity 5582 5623 +41
============================================
Files 728 731 +3
Lines 29775 29897 +122
Branches 3884 3908 +24
============================================
+ Hits 16540 16684 +144
+ Misses 11684 11650 -34
- Partials 1551 1563 +12 ☔ View full report in Codecov by Sentry. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the configuration from the parent (per execution id) was overriding the local config (per plugin). Now the parent configuration is no longer per execution id, i.e. both local plugin configurations (i.e. on plugin level and on execution id level) take precedence.
This closes #3471